Merge branch 'master' of https://github.com/suhr/cargo into update
authorAlex Crichton <alex@alexcrichton.com>
Sun, 25 Jan 2015 05:48:48 +0000 (21:48 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Sun, 25 Jan 2015 05:48:48 +0000 (21:48 -0800)

Trivial merge